merge from upstream
authorjoakim@verona.se <>
Fri, 20 Aug 2010 20:00:00 +0000 (22:00 +0200)
committerjoakim@verona.se <>
Fri, 20 Aug 2010 20:00:00 +0000 (22:00 +0200)
commit364af7fe9b16ed1c05329093b4259dd702957eed
tree0c70837e27d03c2b1d1fd3f6d7e9d070c6e27c35
parent51fdc94ea61fb8c7c1770b3349643ef0ded1c7c5
parent5b79b823d278682cbd9ecadf4701b4cbc4a15868
merge from upstream
lisp/ChangeLog
src/ChangeLog